From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Mon, 19 Aug 2013 21:49:11 +0000 (+0200)
Subject: network: allow disconnecting while activation is in progress
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3566
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6fbe7656365e5e24b91a44a061a6516a3c7746c7;p=gnome-shell.git

network: allow disconnecting while activation is in progress

While connecting, the item should read "Turn Off", not "Connect".
To do so, change the meaning of isActive() to be really "not isOff()"

https://bugzilla.gnome.org/show_bug.cgi?id=706262
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 169400cad..79cb71155 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -104,7 +104,7 @@ const NMConnectionItem = new Lang.Class({
         if (this._activeConnection == null)
             return false;
 
-        return this._activeConnection.state == NetworkManager.ActiveConnectionState.ACTIVATED;
+        return this._activeConnection.state <= NetworkManager.ActiveConnectionState.ACTIVATED;
     },
 
     _sync: function() {
@@ -1083,7 +1083,7 @@ const NMVPNConnectionItem = new Lang.Class({
         if (this._activeConnection == null)
             return false;
 
-        return this._activeConnection.vpn_state == NetworkManager.VPNConnectionState.ACTIVATED;
+        return this._activeConnection.vpn_state != NetworkManager.VPNConnectionState.DISCONNECTED;
     },
 
     _getStatus: function() {